From: Claudio Cambra Date: Thu, 5 Dec 2024 03:38:12 +0000 (+0800) Subject: Replace aAsConst with std::as_const in tests X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~173^2~4 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=271f2eb9b6ff713db6d9bf811cb56f5028e284f5;p=nextcloud-desktop.git Replace aAsConst with std::as_const in tests Signed-off-by: Claudio Cambra --- diff --git a/test/syncenginetestutils.cpp b/test/syncenginetestutils.cpp index d3f351f1c..30c6254e5 100644 --- a/test/syncenginetestutils.cpp +++ b/test/syncenginetestutils.cpp @@ -585,7 +585,7 @@ void FakePutMultiFileReply::respond() totalSize += fileInfo->size; }); - for(auto fileInfo : qAsConst(_allFileInfo)) { + for(auto fileInfo : std::as_const(_allFileInfo)) { QJsonObject fileInfoReply; fileInfoReply.insert("error", QStringLiteral("false")); fileInfoReply.insert("etag", QLatin1String{fileInfo->etag}); @@ -1045,12 +1045,12 @@ QJsonObject FakeQNAM::forEachReplyPart(QIODevice *outgoingData, const QString boundaryValue = QStringLiteral("--") + contentType.mid(boundaryPosition, contentType.length() - boundaryPosition - 1) + QStringLiteral("\r\n"); auto stringPutPayloadRef = QString{stringPutPayload}.left(stringPutPayload.size() - 2 - boundaryValue.size()); auto allParts = stringPutPayloadRef.split(boundaryValue, Qt::SkipEmptyParts); - for (const auto &onePart : qAsConst(allParts)) { + for (const auto &onePart : std::as_const(allParts)) { auto headerEndPosition = onePart.indexOf(QStringLiteral("\r\n\r\n")); auto onePartHeaderPart = onePart.left(headerEndPosition); auto onePartHeaders = onePartHeaderPart.split(QStringLiteral("\r\n")); QMap allHeaders; - for(const auto &oneHeader : qAsConst(onePartHeaders)) { + for(const auto &oneHeader : std::as_const(onePartHeaders)) { auto headerParts = oneHeader.split(QStringLiteral(": ")); allHeaders[headerParts.at(0).toLower()] = headerParts.at(1).toLatin1(); } diff --git a/test/testsyncconflict.cpp b/test/testsyncconflict.cpp index ce358feed..1db24cf24 100644 --- a/test/testsyncconflict.cpp +++ b/test/testsyncconflict.cpp @@ -45,7 +45,7 @@ bool expectAndWipeConflict(FileModifier &local, FileInfo state, const QString pa auto base = state.find(pathComponents.parentDirComponents()); if (!base) return false; - for (const auto &item : qAsConst(base->children)) { + for (const auto &item : std::as_const(base->children)) { if (item.name.startsWith(pathComponents.fileName()) && item.name.contains("(conflicted copy")) { local.remove(item.path()); return true; diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index c745ddcad..079dd18c1 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -41,7 +41,7 @@ bool expectConflict(FileInfo state, const QString path) auto base = state.find(pathComponents.parentDirComponents()); if (!base) return false; - for (const auto &item : qAsConst(base->children)) { + for (const auto &item : std::as_const(base->children)) { if (item.name.startsWith(pathComponents.fileName()) && item.name.contains("(case clash from")) { return true; } diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp index 426b5bfd8..d5897bdf7 100644 --- a/test/testsyncjournaldb.cpp +++ b/test/testsyncjournaldb.cpp @@ -293,13 +293,13 @@ private slots: << "foo bla bar/file" << "fo_" << "fo_/file"; - for (const auto& elem : qAsConst(elements)) { + for (const auto& elem : std::as_const(elements)) { makeEntry(elem); } auto checkElements = [&]() { bool ok = true; - for (const auto& elem : qAsConst(elements)) { + for (const auto& elem : std::as_const(elements)) { SyncJournalFileRecord record; if (!_db.getFileRecord(elem, &record) || !record.isValid()) { qWarning() << "Missing record: " << elem; diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp index 1475013cf..8b5ef5806 100644 --- a/test/testsyncmove.cpp +++ b/test/testsyncmove.cpp @@ -77,7 +77,7 @@ bool expectAndWipeConflict(FileModifier &local, FileInfo state, const QString pa auto base = state.find(pathComponents.parentDirComponents()); if (!base) return false; - for (const auto &item : qAsConst(base->children)) { + for (const auto &item : std::as_const(base->children)) { if (item.name.startsWith(pathComponents.fileName()) && item.name.contains("(conflicted copy")) { local.remove(item.path()); return true; @@ -669,7 +669,7 @@ private slots: } conflicts = findConflicts(currentLocal.children["B4"]); QCOMPARE(conflicts.size(), 1); - for (const auto& c : qAsConst(conflicts)) { + for (const auto& c : std::as_const(conflicts)) { QCOMPARE(currentLocal.find(c)->contentChar, 'L'); local.remove(c); } diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp index c50d471ce..47dabce84 100644 --- a/test/testsyncvirtualfiles.cpp +++ b/test/testsyncvirtualfiles.cpp @@ -32,7 +32,7 @@ bool expectConflict(FileInfo state, const QString path) auto base = state.find(pathComponents.parentDirComponents()); if (!base) return false; - for (const auto &item : qAsConst(base->children)) { + for (const auto &item : std::as_const(base->children)) { if (item.name.startsWith(pathComponents.fileName()) && item.name.contains("(case clash from")) { return true; }